projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e79f9f9 c9c00ed)
bitkeeper revision 1.1108.23.1 (41063218Lo2jBTfOaHXFy3vKMmTV1Q)
authorgm281@boulderdash.cl.cam.ac.uk <gm281@boulderdash.cl.cam.ac.uk>
Tue, 27 Jul 2004 10:44:40 +0000 (10:44 +0000)
committergm281@boulderdash.cl.cam.ac.uk <gm281@boulderdash.cl.cam.ac.uk>
Tue, 27 Jul 2004 10:44:40 +0000 (10:44 +0000)
Merge boulderdash.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into boulderdash.cl.cam.ac.uk:/auto/anfs/scratch/boulderdash/gm281/xeno-clone/xeno.bk

1  2 
xen/common/sched_bvt.c patch | diff1 | diff2 | blob | history
xen/common/sched_fair_bvt.c patch | diff1 | diff2 | blob | history
xen/common/sched_rrobin.c patch | diff1 | diff2 | blob | history
xen/common/schedule.c patch | diff1 | diff2 | blob | history

diff --cc xen/common/sched_bvt.c
Simple merge
diff --cc xen/common/sched_fair_bvt.c
Simple merge
diff --cc xen/common/sched_rrobin.c
Simple merge
diff --cc xen/common/schedule.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.